trying to do conflicts

conflicts mahirap yan