Source code checked in with merging of files