Rename extensions
Solve conflicts