added a conflict
added line to index in master