merged two conflicting copies of main