Fixed bug with merge conflicts