branch conflict AND
branch conflict fixed