Remove after certain amount of time working.

Also removed conflict information.