fixing minor merge problem