resetting
fixing merge conflits