Make dev to master mergeable