implemented merge requests
merged conflicts