fixing my miss merge