Tried to fix mergeerrors. Failed misserably.