merging caused some errors,fixed it