bugs removed
conflicts removed