An apparatus includes a memory and a processor configured to merge a first code branch and a second code branch of a code development project. The memory stores a machine learning model. The processor identifies a first conflict and a second conflict between the first code branch and the second code branch. The processor uses a machine learning model to determine a resolution for the first conflict based in part on a set of requirements for the code development project. The processor then applies the resolution to the integrated code.