added task history
conflicts resolved