Clear conflicts the second time
test
Merge branch 'master' of https://github.com/xgjonathan/NewDesignTool
Clear conflicts for loading a new file
open modified
merged solved