fixed merge conflict and formatting.