fixing merge conflict
fixing issues with merge
fixing merge issues