indenting
fixing up merge issues