fixed merged conflicts like crazy