Fixed merge conflict properly for GitDb.java