Fixed problems
Silly remote changes.
Fixed merge problem