modifiyng conflict with master