fixed weird merge errors