clean code before master merge