resolve a stupid conflict..