Resolve the conflicts to complete your pull requests

[onurklngc]

Would you like to resolve the conflicts or redo the changes on the final version of the project and request a pull again to avoid conflicts?

[harunzengin]

I had error merging the branches as Rahmetullah knows, so I just pushed in master branch