before pull
merges and bug fixes
fixing bugs, and graphical errors
graphical edit