merge master and resolve conflict