some changes
trying to find the merge conflits