Add without confilit file for rebase