merging code from two person takes lots of time