fixing for missing lines due to merge