Maybe I solved merge problem.