major shift. all conflicts removed.