added doors to mansionArea
conflict fixing