Resolved conflict again and made changes in individual files