Fixed all conflicts between drag and resize