merge bugs and feature