attempting to fix conflicts