About window and fix conflicts