just pulling
merging
conflicts solved
bug fixed
bug fixed