Commit added
Fixed merge conflict