Fixed some inbox bugs
modify conflicts