swp added
conflicts fixed