Having problems with merging so I am fixing my files again.