Also removed other merge conflict thing