fixed small errors
merge conflict re swap file