Resolved Merge/Conflict Things

Got rid of the annotations