added garbage to check conflicts
resolved a conflict