Fixed merging problems
End of day fixes