Removed garbage from previous conflict.