Fixed layer merge bugs

Fixed layer merging so that you do not have to draw on the canvas after you have changed the color of your painted layer.