Manually added developer view files after repository conflict