Git Merge Two Files Linux