Fixing merge conflics