add post
fix merge problems