issues with merge conflicts need to be cleaned up in the code. Especially with HTML where this will actually show up in the view.