Trying to fix conflicts