Code Mergining and conflict resolving