attempting to merge changes