Fixing merge stuff