fixed bug
solved conflict