Annoying merge issue fixed

Got rid of the annoying merge file issues.