Edited merge conflict back to original