fix absolute / relative paths
remove old form library
remove file automatically created by git merge
return std mod
Merge