Trying to fix weird merge problem