Fixing merge again