fixed issue
fixed awful merge problem