Removed swap files committed working changes
Merged changes